From 27c451323a75bd3c787689fa5abd171476d5ec25 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 21 Mar 2007 08:51:51 +0000 Subject: [PATCH] LINUX: x86_64: start_pfn should be initialised even when XENFEAT_auto_translated_physmap is set. Signed-off-by: Ian Campbell --- linux-2.6-xen-sparse/arch/x86_64/kernel/head64-xen.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/x86_64/kernel/head64-xen.c b/linux-2.6-xen-sparse/arch/x86_64/kernel/head64-xen.c index dbb1bc39fe..356c0717ff 100644 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/head64-xen.c +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/head64-xen.c @@ -105,13 +105,11 @@ void __init x86_64_start_kernel(char * real_mode_data) int i; xen_start_info = (struct start_info *)real_mode_data; - if (!xen_feature(XENFEAT_auto_translated_physmap)) { + if (!xen_feature(XENFEAT_auto_translated_physmap)) phys_to_machine_mapping = (unsigned long *)xen_start_info->mfn_list; - start_pfn = (__pa(xen_start_info->pt_base) >> PAGE_SHIFT) + - xen_start_info->nr_pt_frames; - } - + start_pfn = (__pa(xen_start_info->pt_base) >> PAGE_SHIFT) + + xen_start_info->nr_pt_frames; machine_to_phys_mapping = (unsigned long *)MACH2PHYS_VIRT_START; machine_to_phys_nr_ents = MACH2PHYS_NR_ENTRIES; -- 2.30.2